Use $CUPS_CONFIG instead of hardcoded cups-config. (#495574, Richard Hult)

2007-11-26  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Use $CUPS_CONFIG instead of hardcoded cups-config.
        (#495574, Richard Hult)

svn path=/trunk/; revision=19062

diff --git a/ChangeLog b/ChangeLog
index a76c9b258da42efbac6f47b89b312dfbae45fa92..c387610221270079cd2c95011357e56a9c86c203 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * configure.in: Use $CUPS_CONFIG instead of hardcoded cups-config.
+       (#495574, Richard Hult)
+
 2007-11-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprintunixdialog.c: Change some labels to be clearer.

diff --git a/configure.in b/configure.in
index 8fc527f8a2212ecc5e2bcc304c52cc7d03b840a9..01578035a44fd9b809e89b427cade709f55e1a95 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1574,10 +1574,10 @@ AC_SUBST(GTK_XIM_FLAGS)
 
 AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
 if test "x$CUPS_CONFIG" != "xno"; then
-  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-  CUPS_LIBS=`cups-config --libs`
+  CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+  CUPS_LIBS=`$CUPS_CONFIG --libs`
 
-  CUPS_API_VERSION=`cups-config --api-version`
+  CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
   CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
   CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`